{#68303716]  Missing "Controls" Button
Merge remote-tracking branch 'origin/68303716_Missing_Control_Button' into develop