Merge branch 'feature/conflicts_package' into develop