ljj_commit69