will work on re-merge with upstream version 1.78 recently.