Merge trunk_left into load_cardlib, ATP
Merge remote branch 'origin/load_trunk_left' into load_trunk_left