1.0.0 wmagent

1.0.0_wmagent branch patch of 
#5433
#5434 
#5447