Release 05.005
Merge branch 'master' into test-FAN