Merge "Restore the ability to use ctrl_interface directory"