Merge "Changes in implementation of Security API - get Token"