Re: HC System tests failure [master and 4.1]