Merge branch 'topic/enum-info-cleanup' into for-next