compat-v3.6-rc7-1
