As a part of #383
As a part of #383