Today
merge from softcore_update (groundwatch_caching branch)