Merge "Added indication update mode support"