Modifications for test of feature 7953