Merge Bill and Notice changes to personal fork