PIM-1366 - update bap