Merge commtis from Zoldyck07