Merged main onis file from trunk.