K3.1 Backend: Fixes #2363 #2362 #2361 #2364
Merge pull request #2365 from 810/develop-fix-1

K3.1 Backend: Fixes #2363 #2362 #2361 #2364