support 15595 build