commit for cmwap wift and cmwap