AHUP-4 - Support free style generic builds