#1057408: Fixed bug. See merge request xrm/basic!205 (cherry picked from commit a2d9c3a1) 225f8ee7 #1057408: Fixed bug. 54cdc25a #1057408: Customized merge request. 5fffb792 #1057408: Customized merge request.