#23302 Upgraded to use framework v0.1.23