This is not scenario related and should be included in different pull request