Merge remote-tracking branch 'origin/newprogram' into debug-0.13