Merge pull request #318 from micmac1/fs-pp-tone-down-flags