I created a separate Issue for this: #698