Style fixes
Merge remote-tracking branch 'origin/unstable-dynamic-albert' into unstable
munich!