0331_2

one of the commits from last PR should be placed within this one. It will be better if the 0331 PR being processed before this one.