Merge branch 'release/r66'
Merge branch 'hotfix/r66.1' into develop
lobbyist merge