AIRIOS-58 Fixed regression on merge