Merge branch 'release/1.6_RC_2'
Merge branch 'develop'
Added small update