Merge "Keep Constable interface in boxed types"