Merge changes Ic5ddba3c,Ibe7a3248 into nextgenv2

* changes:
  Fix a number of msvc warnings
  Reduce number of frames in lossless tests