Added unsafe in for release configuration