CEXT- 619 # optimization