Manually merged from the 4.1-dev branch for trq-1461: Missing PBS_variables for some of the moms.