[ACS450] pick commit from master to 4.5

[Logan Barfield]

I don't know what the current procedure is for this, but I'd like to
get 3a52a83faeaa72a8488b2db1253fef6d3308d708
from master in the 4.5 branch if possible.