Ticket #1414 (Prototype): Fixing issues cited on comments #5705, #5745 and #5746