Bug/996598 hardcoded lib dir