Update from yuk/master

... with some exceptions