Resolved merge issues of AzureStorageContext moving.