Feature/ta21651 21653 21654