Merge pull request #3828 from 9rnsr/fix13223

[REG2.066a] Issue 13223 - Cannot deduce argument for array template parameters
Merge pull request #3838 from AndrewEdwards/2.066

Cherry-picking commits from master to 2.066 branch (for RC1)