Merge trunk
into wcs-migration
branch
#2778
Closed
trunk
into wcs-migration
branch
#2778