Building changes from Pull 37;