Merge "Salt result checking improved"