Merge branch 'issue-792' into release-10.3

1 job for 10.3.1-RC1
latest