More directive handling
auto-merge staging into master