Updated to AWS 1.8.5