PIM-1366 - update bap
Merge branch 'master' into PIM-1265