Merge Changes in 1.5.0