More changes
Merge remote-tracking branch 'origin/feature/1234_test_macros'