Trevorgb gi2149 update times

implements fixes for issue 1859
implements fixes for issue 2149

Supersedes pull request 835.