[next update] master bugfixes ported