LPS-48893 added flag to switch the new behavior