Complete rebase for kitkat.
Currently working for beanstalk