K3.1 - Develop - buttonfix after merge #2444
Merge pull request #2445 from 810/k3.1-develop-fixbuttons

K3.1 - Develop - buttonfix after merge #2444