Merge develop into main to release updates for core versioning and any changes in develop that need to go into Equipment Sharing website.
@ra730@lmh44 Can you both check this over to ensure all the changes in develop other than my one are ok to go up to Equipment Sharing's code via the Upstream?