apply # 226 and bump to 0.5.12-20