Synced with three_cpp dev_r65_extras branch

c902f9eadeb4fbdeb9f662e88959f034efd89654
Also add files marked as new

missed these in previous commit.