Merge "Bugfix: k8 scenario fix"