Merge "Proposal of fix for bug 209"