Update for version r.12 rc6

Should be the same way with the release of r.12 and its also for 1.6.x