Issue #244 fixing conflicts with master
Issue #244 fixing validations problem
Merge branch 'C1_Osam_244_add_tip_4.10' of https://github.com/alaashafaee/Coolsoft-14 into C1_Osam_342_show_tip_4.23