Branch 'pgsql' - 2 commits - schema/spacewalk