Merge "Rewrite scoped arrays with template and introduced nullable one." am: 3204e23c06 am: 2446e5dfef
am: 16aff263ce

Change-Id: If6445319cd3c5a369f856a26c5532493366ba66f