Today
merge from networkcache_ownerid_fix