merge r7699 from 3.4-working, (let per-app settings override program specified positi...