Reverted Mantis Ticket 4998 Amenities ticket
Merge with changes made after Amenities Ticket