Manually add content of D646.
Test Plan: Manually
Reviewers: floca, O3 MITK Reviewer Group II
Reviewed By: floca, O3 MITK Reviewer Group II
Subscribers: kislinsk
Differential Revision: https://phabricator.mitk.org/D846