JBTM-1470 keep the option to condionally build the AS