Merge branch 'feature/#7648' into develop