Push/pull errors improvement and cleanup Upstream-commit: e17afedfe061ce2f02451c213b7c8b7aae01ba2f Component: engine