Some code for cross builds was added
stage_checks: disable gen_unregistered_CONFLICTS, it is too slow
Merge remote-tracking branch 'head/master'