Making sure we are not importing CRs and BOMs

Fixes #4643