Changes to non obscuring fields
Merge pull request #9694 from John-Candlebury/smoking-smoke

Changes to cigarrete smoke
Merge branch 'master' into diaperfur