Feature/zen 11926

Ditto the above comment.