Merge branch 'develop' into issue/2099