Merge xy/jellybean at 2.5