Merge "BUG-972: correct Precondition"