merge master into staging
fixed tests