Merge "Use configure-swap from o-z-j"