Merge Fix kitkat