Merge "Add timestamp API extension for predictive back" into main