Adds fix for #714 for RS, DO and AWS