JJS_0323 commit