Add task and test to bug: 50988151