merging with the latest dev branch

merging with the latest from dev branch at pb/pb