Merged dev-victors changes