[TIMOB-12364] Third times the charm!