Upgrade to Normalize v3

BS3 commits: 01dabd3391591df44f8a0d960bbd14a23723f31d