cc: AfterAreaChange fixes
js triggers refactored
merge master
testing
merge
rebuild
rebuild
rebuild
automatic master rebuild
automatic master rebuild
automatic master rebuild
automatic master rebuild
automatic master rebuild
automatic master rebuild
automatic master rebuild
automatic master rebuild
automatic master rebuild