Merge branch 'hotfix/modify_pgsql_part_for_data_dir' into develop