Don't merge ADEN-1235 Krux in head