Previous commit applied for iOS side