Merge in latest BPC app updates