Resolves: #i124067# naïve considered pretentious

Change-Id: I1878614177735559c0d38859e3af606d324b7509