AWS-1.6.8 merge