Prepare waresdev 496