Merge "Revert^2 "[framework] Integrate new quantizers"" into sc-dev