common: push latest changes

I don't really remember what I have done :P