CMS Bokchoyenv update

Reflect changes in lms/