Merge changes I97b697c9,If13df157

* changes:
  libtimeinstate: use std::optional
  libtimeinstate: fix map names