Merge branch 'pr_1078' into development