Merged tag 1.3.0