Fix diagnostic Postgresql
Merge branch 'develop' into billing