Merge branch 'pg-image-not-found-fallback' into 'master'

fix: white screen crash for custom Docker tags

See merge request !1043