Merge "Fix some compile errors occurring as a result of robo enablement" into main