Thanks to makis marimpis<makhsm@gmail.com> for the patch! REVIEW: 104933 FEATURE: 56749 FIXED-IN: 4.9.0