updated identifiers to handle bfc
Merge remote-tracking branch 'origin/release/2.0.3' into release/2.0.3