More merge conflicts resolved. This includes changes for VIX-520 as well as VIX-580 since they are built on the same files and had an impact on each other.