Merge branch 'FhG/external-renderer' into shared/external-renderer-masa