Merge "API update for insets"