Final version for SDK 1.12