Merge remote-tracking branch 'kumar/next' into next

A few more fsl updates from Kumar