Merge all changes from K3.0.6