Devex: Resolve merge conflicts dev
#143
+662
−182
Merged
dev
#143