PROB-322: Applied changes to ProB2