Merge "Breaking up 6360: dummy console"