That said, I'm ok to leave this for a different pull request if we open an issue in JIRA to refactor the whole autoscale and set the fix version to 1.7 (or the versions this PR will be merged to). Just want to make sure we don't forget this and we don't increase our technical debt.

WDYT?