more aggressive cache invalidation
local mods
Merge remote branch 'origin/master'
clear layer cache on m2m changed