Merge "Fix/Update clang-RAII macro implementation"