Merge "Fix issue introduced by API change"