Minor merge with master thread.
Save input frames fixes.
BestShot mode upgrading.