Feature/ta17469