Re-rolled patch #3, Fixed custom command failed. Attached interdiff for same.