Feature/12993 14091 sql