[DF-1724] Merged fix of ResourceEditor crash on macos on start