merged to latest version