Merge "Handle_tags and branches for unmaintained also"