Merge commit '81efcdfee658710bd267e6f335d7cf505224492b' * commit '81efcdfee658710bd267e6f335d7cf505224492b': Fix issue #2179891: Need to update 5.xml
Merge commit '81efcdfee658710bd267e6f335d7cf505224492b' * commit '81efcdfee658710bd267e6f335d7cf505224492b': Fix issue #2179891: Need to update 5.xml