Update code to follow 0.3.7.6_r18717