[#71699596]add merge from develop to QA
Merge 71699596-Tool_should_Merge_in_the_dev__ to develop

[Completes #71699596]