[MERGE] orm: cleand get_pg_type(). Changes as written in the merge prop.: