Merge latest master changes into development

This includes changes needed for the new deployment scheme.

Best Regards,