Hi Andrea and Pal, 

the attached file is the patch applicable to snapshot after commit 
9676e4d7766cea647a4e2b9e27fad97479b418de

Kiong-Ge.