Track merging of feature from PR #264 into master branch

[coderabbitai]

This issue is to track the progress and necessary actions for merging the feature introduced in PR #264 (#264) into the master branch. Please refer to the PR for more details on the changes.