merging Sprint 36 changes in the 'release' branch back into master