FORGE-2113: Fixed handling of UICommands