PROBCORE-440
partial fix for PROBCORE-441 (may work if PROBCORE-440) is finished