PR: 58166 Submitted by: Cheng-Lung Sung <clsung@dragon2.net>
Modules. PR: 32868 Submitted by: Sergey Skvortsov <skv@protey.ru>