Merge commit 'bf765b6c70c0cc5e494c1361747d3b93e98d962d' * commit 'bf765b6c70c0cc5e494c1361747d3b93e98d962d': API_CHANGE