Merge branch 'master' into development
Merge branch 'MPD-FH' into development
Merge branch 'development'
Merge branch 'master' into development
minor tweaks

incl. relocating bonus discussions, from separate section to adjacent
to final discussion…
Merge branch 'MPD-FH' into development
Merge branch 'development'