Merge "Fixed BuildCheckedDiv signature"