Merge branch 'develop' into feature/3475110-depricated-fixes