first commit on 1.6 support