PLFM-2117; integration tests pass