Merge 'gamemap' into 'develop' conflicts resolved