Merge latest changes (v08)