Merge branch 'nabinhait-billing_status' into develop