@raydavis totally agree, can you open a jira for that? Doesn't need to be part of this PR.