PR: 23756 Submitted by: Ports Fury
PR: 12690 Submmitted by: Andrey Zakhvatov <andy@icc.surw.chel.su> Reviewed by: Ryo MIYAMOTO <rmiya@cc.hirosaki-u.ac.jp>