Add support for recovery patch number to all related scripts