PR: ports/124539 [1], ports/124545 [2] Submitted by: wxs [1], Wen heping <wenheping_AT_gmail dot com> [2]