And for the 2 static libs define the catalog on compile time so it gets loaded properly (cherry picked from commit 07e49ea7)