merge from team/rizzo/astobj2, rev 47243, 47244, 47245: