ljj_commit17