[QE-1024] More changes