CORE-4073: Minor update
Merge branch 'Ongoing'