Another enhancement from the code sprint at @flyeralarm in Würzburg: This fixes: #3122 and #3602 If you would like me to change something before it can merged just give me a hint.