Multi-issue fix [IS-1] [IS-2] [IS-3]