Fixing CI errors and build errors Reverted changes: NULL in EV_SET macro; Clang-formatting Reverted changes: MacosX *.m files reverted from master