Rolling back from update 2021.02.23.0

Rolling back for few hours to fix some bugs and regressions