More changes related to EUCA-10005