Merge branch 'issue/1577' into 'develop'