Merge remote-tracking branch 'donkult/feature/clientmergepdiffs' into debian/experime...