Merge branch 'issue/2036-part-2' into 'develop'