branching from 0.5.13.5 release