Merge branch 'feature/478976'