[507406] Adjust returns of redefined properties
5 files changed