Merge branch 'issue/1872-ex_aws' into 'develop'