Merge: from mt_snapshot_saving - Bugfix for exception when saving ApartmentRooms in Jobs 4 mode Tests: rented a room in Jobs 4 mode, verified with debugger that code was hit and no exception produced