Merge of latest dev from my branch