Merge branch 'devel' into elb-hosted-zone