Reverting merge to version 1.5.2