Fixed some compat issue
Improved default behavior
auto-merge staging into master