Added notes for #542