[IM] Tweaks from production
Merge branch 'nf-smokeping'