Merge "blueprint for 3.1.0 - deployment-handler"