LPS-42961 Keep original behaviour if property has been overridden