Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'