Devel

Merge devel (74.5) into master