merged change restoring legacy 'prefix-target' option and added 'prepend-contour'