Merge "Improve BaseBundle#kindofEquals"