Added whether it is allowed as an argument name or not
auto-merge staging into master