Merge #10901: Fix constness of ArgsManager methods