#4137 general core tidy