Refactor a bit
Refactor a bit
Refactor a bit more
Merge remote-tracking branch 'origin/sample-cond_macro' into develop
Merge remote-tracking branch 'origin/sample-let_macro' into develop