(InvitingGuests) Fix merge compatibility issue
(InvitingGuests) Fix merge compatibility issue

Orodan/Hilary,stuartf/Hilary,mrvisser/Hilary,mrvisser/Hilary,timdegroote/Hilary,simong/Hilary,timdegroote/Hilary,jfederico/Hilary,nicolaasmatthijs/Hilary,Orodan/Hilary,stuartf/Hilary,jfederico/Hilary,simong/Hilary,nicolaasmatthijs/Hilary