Merge "Added 15 APIs support"