Merge "Return immediately when prop is not found"