Sub task for #1483
Sub task for #1483