Merge bill branch into development

Merge bills branch into development