CEXT- 621 # optimization