~andreh/diff539