Apparently, sometimes the frame's unit has no GUID or something
Merge branch 'release/v60000-2.0.1'

* release/v60000-2.0.1:
  Apparently, sometimes the frame's unit has no GUID or something