Issue #3423981

Closes #3423981

changed target branch from 11.x to 7.x

added 1 commit

• 0c8971be - reverted back auto changed list functions.

Compare with previous version