MP1-4585: Adding back support for app commands.