Merge "Fix overriding commands warnings/error"