Final commit of refined cases along with new TC19714 & TC19910