Implemented PROBCORE-492