Merge "Bug 560: Fixed incoherent API implementation."