Cherry picked indentation commit