Merge branch 'NEW-MASTER' into Nima-Ghods
selfCheck and override fix
Merge branch 'Nima-Ghods' into NEW-MASTER