Merge headless changes from cwm 6.0.3.4