Good point about new versions of the package. Adding a flag at package registration level seems to be the right way. I will hold on this set of changes for now and just merge the changes related to report abuse.. 
Yes,I see that having separate branches for individual fixes will help here :)