Added Refresh Token Fixes from master