Ported actual fix to v1.25
Merge commit '64efdbba3421dc35132249e0fb37e774dafb69cb'
Updated Readme