Merging changes for Advanced option to send the access token in Header, Query or body