K3.1 - Develop - buttonfix after merge #2444