#15472 #15440 picks to master (for validation)