Merge master to pickling