merge last 1.15 branches

trying to bring in the three latest changes of Jorge.
paul