Merge change 4843

* changes:
  checkpoint filmstrip, implemented TLS.