user story #1447 - Refactoring salt
Change-Id: I5a871c65b8f19b032ece6fa45754ab3a39833d77