Vlad Mihalcea, I think that HHH-9512 can be fixed before this. I haven't had a chance to review the PR yet though.