merge master into ticket 9729 test branch