merge 'add/create-domain' into 'map-domain'

Change-Id: Id680fa182b5082fe940c23be107788d9a3e0a5f9