Merge to pull request for commits: e78e8e97d4e43ff69a8d3c2558572e614deb7a71 and d994c274caa80514bbc16ba48f840eda6bfcfd7d