LPS-43419 AMS just wasn't set up to use the new code
LPS-43419 Source formatting
LPS-44689 Make it more generic