07.15.21 DOC & BPP Merge