0.02.06 preparation for 2.07.0 compatibility