Merge "Allow boards to turn overriding commands into an error"