Fix warning for MSVC.
Add missing implementation.
Merge branch 'master' into develop