Re: backports of afca6c5b2595 and ee457001ed6c for 4.4-stable