Followed up on discussions code review
Merge branch 'discussions' into validation