Manual merge of cummulative code changes from the general version of the be BPC app