Merge "Fix preference retrieval" into stable-2.16