v1.3.0.495 - command rewrite