Merge from hassy-master