Merge "Small fixes for reset password token" into tm-dev