Add BLESS for compile-test and some cleanup
#11039
Merged
BLESS for compile-test and some cleanup
#11039