Merge "Revert "Rewrite scoped arrays with template and introduced nullable one.""