Merge commit '255ba31a75d864d9c7278c9aceb542652b80d586' * commit '255ba31a75d864d9c7278c9aceb542652b80d586': Fix issue #2258571: Fix build versions
Merge commit '255ba31a75d864d9c7278c9aceb542652b80d586' * commit '255ba31a75d864d9c7278c9aceb542652b80d586': Fix issue #2258571: Fix build versions