Add notes regarding #407