Merge with latest stable

see title