Change default entries replacement logic and add option to use previous logic…

Authored by sirgienko on May 1 2020, 8:59 PM.