jf: general fixes

Change-Id: Ib520728e453e0167d44e74df2428b0517313f855
Merge remote-tracking branch 'cm/cm-10.1' into HEAD