changes  replicated from master branch with commit no 9302bbb