solve the issue[SAT-1349,SAT-1360,SAT-1361,SAT-1366,SAT-1375,SAT-1376]