Completion bug fix. Prepare new generation of BVR Reference
Merge branch 'master-bug-fixes' into message-center

Merge master-bug-fixes into message-center