This is a rebased version of !586 (closed) with an added changes file and with maint-0.4.7 as target.