Issues #1141, #1142 and minor fixes
Version 3.5105