Merge "Remove the SECOND_LEVEL_CHECKS_BEST macro"