Add support for rebase bug subfolder