WC-458 #comment timeline refactor