Merge remote-tracking branches 'asoc/fix/ad1980' and 'asoc/fix/isabelle' into asoc...