Branch 'pgsql' - 6 commits - schema/spacewalk