Issues (4057)

Branch: fix-integration-tests