Merge branch 'feature/479966'