Merge remote-tracking branch 'catalyst-oniongit/bug23611'