ljj_commit26