BIGTOP-1421 Phoenix build is missing some variables
Merge remote-tracking branch 'public/master' into branch-0.8