Merge "[COMMON] Fix postgres data persistence"