Merge "Remove storeclient id" into devel_3.0_main