Merge changes I5ae79f9d,I7be49f60

* changes:
  Use proper alias for BW, BO and BIG
  Add support for BigWave