apply all requested changes for maintainer code review (see bug 708688)