Merge branch 'Cougar-devel' into devel