Merge branch 'feld-develop-patch-26755' into 'develop'