Merge changes from K3.0.4, small improvements