Merging OC-5839 into OC-6048