Merge branch 'issue/1354' into 'develop'