Merge pull request #6774 from Mazyod/v3-mac-secure-input

V3 mac secure input
[ci skip]
[ci skip]
Vector2 replaced by Vec2
Merge pull request #6779 from jonseg/cpp-template-error

Vector2 replaced by Vec2 in cpp-template