'update cache'
Fresh merges for 3.01a-integration