Merge branch '3.12/kdbus' into 3.12/my