Remove time/text changes from the API (#1815)
Fixed conflict in optional repo commit id
Merge branch 'gh-1815' into staging