fix typos
Merge branch 'dpph_lockin' into develop