Fix/timelines custom fields release branch

This is a rebase of #980 for the release/branch.

There should be no differences compared to #980 in here.