updates from BS sources

Change-Id: I4cc08e121fc7ce41e6ee198d642a1ca3538fea74