Get update from ckittask/RAG-Module wip_3_12 into rootccodelabs/RAG-Module RAG-217

Get update from ckittask/RAG-Module wip_3_12 into rootccodelabs/RAG-Module RAG-217 #601