Added partial fix to handle crossreferences
Merge branch 'development' of github.com:loopdk/loop_external_data into development