Merge "Fix for I5211ec50 (d969a27): more refactoring of the code."