Only set idProperty if identifier provided, fixes #17557