continued pre-merge of trunk
final pre-sync before trunk merge