Configuration and glide related changes are committed to this branch. Kindly check and merge the same to the staging branch
