Backport to 3.2: Use undeprecated install dirs (v2)
V2: changes related to increased dependencies are not made (these stay in master only). As requested by Friedrich:
V2: changes related to increased dependencies are not made (these stay in master only). As requested by Friedrich: