Merge fix in order to minimize our timeline JS.