1.5.0-pre: Continue cleanup.  Add hook to disable inline control