Revert "Remove redundant method and method call"

This reverts commit a1812d1980f0157cba21400a2d7b93b4cbbc851e.
BF: removed focus changelog item as it has been reverted
Merge branch 'master' into stable