Merge branch 'ph/diffopts'