Merge "APM: Fix config de-serialization"