Merge "MSKP capture: write to a different directory" into main