ljj_commit68a