working on [#72304142] and [#72304174]