#4137 tidy core
#4137 fix build