Merge "more Newapi compliance"