Syncronized with latest changes in Master branch.