Merge pull request #2 from mariez/master

#17449 - implementation of proposed design changes
remove comment