Merge remote-tracking branch 'remotes/origin/2.4/feature/dining' into 'REST-API-Integration'