Timob 12354 Ambiguous context fixes