Updates #893 commits