lmk from 3.4
Merge "lmk from 3.4" into jb_chocolate