debug after platform
client merge