Revert "revreted and fix the issue"

This reverts commit f5b9806ed74d74cffd21fc9c7e90a2cd198d7846.
fixed bug
step no. 9
Merge remote-tracking branch 'origin/development' into feature_f
fixed