Prepare get token form
Merge master