Design and code follow-up on LEAN-174
As !532 (merged) was already merged we'll use this to track follow-up.
Vassilis has asked for design revisions, see https://jira.atypon.com/browse/LEAN-174?focusedCommentId=4676539&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-4676539
@mbartenev any revisions you'd like to the code?