Merge branch 'develop' into beta

Fix issues with resource errors caused by gadget setup