Foundation: merge pending local code into develop#189

cailmdaley wants to merge 35 commits into

developCosmoStat/sp_validation:developfrom

stub/foundation-mergeCosmoStat/sp_validation:stub/foundation-mergeCopy head branch name to clipboard