Issue #907 Can star repo
Merge remote branch 'fork/907'