Merge "[Bouncer] Add better way to determine inflection." into tm-qpr-dev