[#2] PR comments resolved.