I believe this issue has been resolved by the recent fix for issue [e94c8bc845].