Manually commiting changes from the following commit in the HEAD version:
15eb8335793d6cde9a65b8ddba2614d8eaa885a4