backporting from HEAD VS: ----------------------------------------------------------------------
Changed paths: