Change request #255: V8.1 Update