@stefanpenner  I know we wanted to do this by default but probably we would be doing extra work where is not required.