Merge develop into master for deployment (hivesigner support)