Update for Shangai :sunglasses:
Merge branch 'development' into development-latest-umlaut