#293 Extract baylor import to component
Merge branch 'issue_293' into develop
#293 Removed unused namespace aliases