Added the changes in RootConfig from 5.34 branch. Added a test to execute a macro.