Merge upstream develop origin cgdevelop

merged origin/cgdevelop and upstream/develop into origin/develop