Merge "Environment should only warn when asked." into jb-mr2-dev