Fix committed

Steps for fix committed:

  • for non-src, done
  • for src, may or may not want to ask if it fixes problem
  • for src, may or may not want MFC