merge CJ-986 branch