Update master with latest from develop

Mark HOEBEKErequested to merge
develop into master

Dynamic asset server now uses FastAPI.

Merge request reports