Fixing TOOLS-2476 - Inline Editor for OM