merge with upstream version 1.6