Bringing indentation fixes into stable