Updated and added the new features from IBP to BBP master