Merge branch 'topic/nhlt' into for-next