ubuntu-trial/huzane

Oya merge and commit