backport of fix for PROBCORE-467