Merge "Added data coding scheme and location check time support"