Merge remote-tracking branch 'origin/pr/265' into develop

Merge remote-tracking branch 'origin/pr/265' into develop #1089