Core: Add missing changes in f7e7f5fe26cca68f51e9ad9869f057ebbe191d32