A10 vision

#4696
PR was merged prematurely. Here are some extra fixes.