Results 2 comments of Yuba

@asolntsev Now that the UT you pointed out has been ready, could you consider merging this PR?

@xael-fry How about including this PR in release 1.8.0?