Fixed remarks on issue #18937
Merge branch 'development' of https://github.com/tdvsdv/usability into development