This task is related to #1119
This task is related to #1119