Merged from decoupled