Merge "[SO] Documentation for ASD/CNFM"