Merge "Deploy plugin fix"