Merge branch 'offboard2' into resl-indoor