Added a test
auto-merge staging into master