merging same changes like v1.3