Merge "Introduce ApiHelper"