Merge "Kqueen default variables refactoring"