Merge remote-tracking branch 'upstream/master' into 1609-ignorelist-rendertime