Re:Edited from JT-102
Merge branch 'JT-102' into Dev