working changes to all SDK-3.6.x projects