close AF-1610, AF-1601 **Original PR in design: [#138](https://github.com/toeverything/design/pull/138)**