Backport fixes and ident+desc feature from 1.7.2.