Merge changes Iaef3c67b,I983277fd into tm-qpr-dev

* changes:
  Bouncer - Fix default alignment
  Transitions - Add more source data, refine existing transitions