SDK 5.1: stabilization fixes