merge last fix of master on branch 1.1 + fix find of quota