commit oscmm
merge oscmm