Code update to rev ce986edb9dc4078b5a010b6b678a7fce24082c3f