This PR is to fix and add additional implementations for the targetted branch, as the source branch is extended on it. This PR is related to this issue.