Revert merge branch 'feature/3122' changes