Fix for OCM-65
Fix for OCM-68
Merge branch 'OCM-65' into trunk
Merge branch 'OCM-68' into trunk