Merge develop into desk-v2

First merge of develop into desk-v2 since branch point (42 ahead / 322 behind) to unblock Rail/Navigation Item authoring.