Merge branch 'release/5.4.0' into packaging
part of the patch is no longer necessary

fixed upstream
Merge branch 'packaging' into cae-packaging