Yesterday
merge from frontier_external_fixes