Merge branch 'feat/add-bundles-to-gitattributes' into 'develop'