Merge "fix bugs : N_SE-7636, 7646, 7699, 7705, 7706, 7800, 7847, 7882, 7925, 7957...