C3 nohahesham master conflicts

master conflicts fixed
@m0hamed