merging same changes like integration-v1.3