Merge Julusian changes

Merge Julusian changes