Merge changes from jellybean branch