[Security] fixed wrong merge (refs #4776)