merged in change to allow multiple hotfixes simultaneously