Create review support, fixed merge conflicts