Proposed v1.5.1