Merge branch 'develop' into issues/553