Merge: fix nitcc assert failure and nitcc continuous integration