Merge branch 'fix-defined-twice-error-on-empty-struct' into staging