Merging develop into master to fix production errors