fix affected billability graph
Merge branch 'dev' into dev_mirror