Committed to core-8-6-branch by commit [ec79505e] and trunk (with button-6/7) by commit [5cc8fffe].

I hope, this resolves the bug.

Thank you all and specially Csabah,
Harald