Merge 0705

Merged with Yonsm’s code