Merge branch 'topic/hw-constraint-single' into for-next