Merge branch 'features/validators-note' into 'develop'