Changes for bearer token support