Merge remote-tracking branch 'origin/OC-13477'