merge from siddii master