Merge: New `optional` annotation on attributes