Merge branch 'feature/499979'