Final polish design for #1509