Merge "Re-add sys_traced prop"