[BSLWAC] Phase 3B of NAF conversion