Merge "Clean up post in WM package"