merge in polina fixes and bump again