comment
fixed refreshOnChange
fixed domain update handling
Merge remote-tracking branch 'upstream/master'