Fix library config
Merge remote-tracking branch 'origin/M4.1' into M4.1