Merge persist
Signed-off-by: iGio90 <giovanni.rocca.90@gmail.com>

Change-Id: I84b237bed419c9dce7d3cfe17d72907608b610a5