Merge tag 'v1.05.1' into develop

Add Apache License 2.0
Fix compilation errors from previous merge.