Incorporating changes made in BP branch

Change-Id: Iaa8ea381f02b5f08c8d862cbfc591934a7de7ad9