Revert "Revert "Merge remote-tracking branch...
Revert "Revert "Merge remote-tracking branch 'origin/wip-jlindgre-timehandling' into integration-1.2"" This reverts commit 112f1845.
This diff is collapsed.
Revert "Revert "Merge remote-tracking branch 'origin/wip-jlindgre-timehandling' into integration-1.2"" This reverts commit 112f1845.