timob-14769: Fix fastdev crashing issue on sdk 16+