Merge "update checkbox based on FAS API" into pi-dev