SHL-91 SHL-80 Provide ability to disable built-in commands