Synch with code in bp branch

Change-Id: Ia6f772a1e7b6412ffc14b31ff3a760afbb744db0