CM3.21 update and xdebug plugin