Blocking issues for merge

Fix blocking issue of the pull request