IMPROVEMENTS for the bugs 7802 and 11109