initial commit for CMOSD-497