@mjura Am I understanding right that you'd like to get this PR in before address this comment?