- rel 7; timeline zoom fix from upstream