applied patches from 1.6.0 release