!XF (Sandbox) (DEV-7472) Integrating ce_task_proptree2_improvements to ce/main....