QAART-224 wam fixes for devbox