* commit '962b06f9a02f08392b6f87225a314ebf39dd7a07': Fixed several time related states for secondary users