translated changes introduced in 76141e29479cfd185ade1cd0303f6cf3b382fbe7