Merge dev to hom
requested review from @aacf20
assigned to @aacf20
mentioned in commit e7246ccb
merged