Merge "Added in Marlin and Angler to targets" into n7.0