Merge of 4.1.1 and new billing reference number feature