Security is paramount so kudos to the merge