Hi @rossella 

It looks like you're still partly reverting 34fe90cd08c9ca456f4d1c1e033f2fd7e1173e6c. 
Could you base your change on top of the current tip of stable/grizzly?