Comment 42 for bug 1251590

@Nova-core: please review proposed patches and backports !