We use forked version 1.6.1 from 1.6 release tag as current workaround.