Merge branch '2790-fix-thrown-error-assertion-fail' into 'develop'