Merge remote-tracking branch 'omap-pending/for-next'