@vavolkl this is ready for review. Please let me know if you have any questions.
Looks good to me!
mentioned in commit e7619218
merged