LPS-43419 AMS just wasn't set up to use the new code
LPS-43419 Source formatting
LPS-43419 We can use 6.2 in this branch?