Yesterday
Merge from placement_improvements