Manual merge from kikupon_ios_test