Enterprise release

@zzen Please review