Merged from decoupled branch
Removed tests