Added tests and code to handle support-* branches