[DF-1359] Added restoring of converted to shadow entities for DF-1963
[DF-185] Cherry-picked commits from development