Update to latest clean-selectloop master