Merge pull request #18400 from aydun/class_api_tweak_2