Martin Trigaux [Mon, 3 Nov 2014 14:59:17 +0000 (15:59 +0100)]
[IMP] product: search on internal reference
When searching on the name of a product.template, search also on the default_code. Move the filter from product.product to product.template.
The field default_code is on the product.product but accessible through a related field, meaning when reading it will fetch only the first variant but searching on all variants.
Fixes #3399
Géry Debongnie [Wed, 29 Oct 2014 14:43:10 +0000 (15:43 +0100)]
[IMP] display breadcrumbs content in browser tabs
this change is simple, except that many actions display a form view in
'create' mode to edit some stuff (for example, most settings forms or
the 'Your session' action in point of sale).
As a work around, we use
a simple heuristic (nice word for horrible hack): the title displayed
is the title of the action if we have a single form view.
Géry Debongnie [Fri, 31 Oct 2014 12:59:33 +0000 (13:59 +0100)]
[FIX] various layout fixes for searchview related issues
include modal dialog fixes, css issues in searchview, missing
field description, ...
Merge branch 'master-searchview-fixes-ged'
Géry Debongnie [Fri, 31 Oct 2014 10:28:40 +0000 (11:28 +0100)]
[FIX] add missing descriptions to many fields
Géry Debongnie [Thu, 30 Oct 2014 16:09:13 +0000 (17:09 +0100)]
[FIX] fix database manager layout
it was hardcoded to the previous layout, so completely broken with
the css. it now uses the current layout
Géry Debongnie [Thu, 30 Oct 2014 13:14:31 +0000 (14:14 +0100)]
[FIX] fixes modal window layout bugs (addon web)
Géry Debongnie [Thu, 30 Oct 2014 15:10:08 +0000 (16:10 +0100)]
[FIX] add missing description to action
Géry Debongnie [Thu, 30 Oct 2014 13:19:24 +0000 (14:19 +0100)]
[FIX] cursor: pointer when hovering on trash icon
Géry Debongnie [Wed, 29 Oct 2014 10:21:32 +0000 (11:21 +0100)]
[IMP] add a 'or' operator between custom filters (web)
Géry Debongnie [Thu, 30 Oct 2014 09:36:43 +0000 (10:36 +0100)]
[FIX] fix bouncing buttons (when no content)
i am aware that this is an interesting hack, and that i do not resize
correctly the $buttons after the bouncing effect, but at least, it
solves the problem.
rsi-odoo [Wed, 13 Aug 2014 08:56:19 +0000 (14:26 +0530)]
[REM] project_timesheet: report_timesheet_task_user
Julien Legros [Thu, 30 Oct 2014 15:18:59 +0000 (16:18 +0100)]
[FIX] crm, hr: fix web_tip css selectors
Some selectors were broken by layout changes in
d822766296fed8f72d3168c675d4cf0b89e73f0c
fwi-odoo [Tue, 7 Oct 2014 10:32:16 +0000 (12:32 +0200)]
[IMP] hr: onboarding
Mohammed Shekha [Wed, 25 Jun 2014 10:15:32 +0000 (15:45 +0530)]
[IMP] product: allow to search on supplier info if
no previous result found in the search, and a partner is given in
context.
Added context data in account and purchase to enable this feature;
Christophe Simonis [Wed, 29 Oct 2014 18:45:09 +0000 (19:45 +0100)]
[MERGE] forward port of branch 8.0 up to 92c7874
Olivier Dony [Wed, 29 Oct 2014 18:42:13 +0000 (19:42 +0100)]
[FIX] account: indendation error in 82588fa
The original tax should not be included if
it was found in the tax mapping, even
if it has no replacement.
Fixes #2261 (hopefully, this time)
Christophe Simonis [Wed, 29 Oct 2014 18:33:02 +0000 (19:33 +0100)]
[MERGE] forward port of branch saas-3 up to 21b1203
Christophe Simonis [Wed, 29 Oct 2014 18:05:43 +0000 (19:05 +0100)]
[MERGE] forward port of branch 7.0 up to 43db726
Simon Lejeune [Wed, 29 Oct 2014 17:45:25 +0000 (18:45 +0100)]
[FIX] l10n_fr: "passif" part of the "bilan" report
Report's model was full, but not the view. Leftover of rev
7e8dcc5600b61d68af
refactoring.
Christophe Simonis [Wed, 29 Oct 2014 17:28:07 +0000 (18:28 +0100)]
[IMP] core: manage registries via an LRU.
When working with a large number of databases, the memory allocated to
registries wasn't limited, resulting to waste memory (especially in the
longpolling worker, which is not recycled).
The size of the LRU is depending on the soft limit configured for
workers.
Jeremy Kersten [Wed, 29 Oct 2014 16:43:44 +0000 (17:43 +0100)]
[FIX] web_calendar: cast the id into int. When you open a form view in a popup via the attr 'event_open_popup', in some cases the id is a string and so the popup is empty... FIX #545 PR #551
Olivier Dony [Tue, 28 Oct 2014 12:30:26 +0000 (13:30 +0100)]
[FIX] account: tax mapping logic was broken by 7508b7c
The original tax should not be applied
if at least one destination tax was
applied. It should only be applied if
explicitly included in target taxes.
(Re-)Fixes #2261
Jamin Shah [Tue, 9 Sep 2014 12:26:33 +0000 (17:56 +0530)]
[IMP] account_analytic_analysis : Add recurring field to product and add product to contract if it is recurring product on creation of sale order
Andrea Stirpe [Wed, 29 Oct 2014 11:54:52 +0000 (12:54 +0100)]
[FIX] bus: useless setTimeout call
Partial backport of master fix eb52156
Solving javascript error after refresh in ie9 `Error: useless setTimeout call (missing quotes around argument?)`
Simon Lejeune [Wed, 29 Oct 2014 12:31:52 +0000 (13:31 +0100)]
[FIX] website_sale: usability fixes in the checkout/address form
* `disabled` on the country select tag instead of `readonly`
* `create a new address` selected when the user set an invalid shipping
address and must correct it. Else the user was correcting the shipping
address but the option "ship to the same address" was selected.
Simon Lejeune [Wed, 29 Oct 2014 12:27:15 +0000 (13:27 +0100)]
[FIX] website_sale: don't apply the company name as street logic in shipping address
Simon Lejeune [Wed, 29 Oct 2014 12:25:43 +0000 (13:25 +0100)]
[FIX] website_sale: remove spurious print
Xavier Morel [Wed, 29 Oct 2014 14:53:41 +0000 (15:53 +0100)]
[ADD] doc: support for analytics keys
David Monjoie [Wed, 29 Oct 2014 09:56:48 +0000 (10:56 +0100)]
[FIX] purchase: translate purchaseorder and quotation reports
Mohammad Alhashash [Tue, 21 Oct 2014 19:12:58 +0000 (21:12 +0200)]
[FIX] stock: UoS quantity in stock.picking
Implements the UoS TODO items on stock.picking.do_partial() to fix #1432.
Add a new method _compute_uos_qty() on product.product to computes
product's invoicing quantity in UoS from quantity in UoM.
The created invoice will use the product_uos of the stock.move, meaning keeping
the quantity specified on the partial picking and the unit of measure of the
original stock.move (e.g. recieving 1 dozen from a 12 unit picking should either
get uos=dozen, uos_qty=1 or uos=unit, uos_qty=12, not a mix of both)
Fixes #1432, opw 611479
Géry Debongnie [Wed, 29 Oct 2014 08:58:05 +0000 (09:58 +0100)]
[FIX] announcement bar was broken, mea culpa (addon mail)
Géry Debongnie [Wed, 29 Oct 2014 07:42:44 +0000 (08:42 +0100)]
[FIX] various fixes with the new search view (web)
various fixes (code bugs and UI problems). some notable changes:
* lots of css fixes
* it should work with IE9+
* tooltips, confirmation dialog when removing filters
* improve main client layout (remove table structure)
* better modal windows
Géry Debongnie [Tue, 28 Oct 2014 13:29:44 +0000 (14:29 +0100)]
[FIX] correct a layout issue in viewmanager (webclient)
problem was that the pager was not displayed/hidden at the correct moment
Result is that when switching views, the header sometimes takes an extra
line. The pager is now hidden just before creating the view
Géry Debongnie [Mon, 27 Oct 2014 14:09:27 +0000 (15:09 +0100)]
[FIX] fixes an issue with non-displayed favorite filter
If someone removes the last filter in favorites menu, it removed the
divider, and therefore couldn't properly add a new filter.
Géry Debongnie [Mon, 27 Oct 2014 13:50:38 +0000 (14:50 +0100)]
[FIX] fix bouncing problem on create/import buttons
the bouncing is supposed to occur when clicking on the area in view list
with no content. Problem was that the Create button was separated from
the import button while bouncing. This commit fixes the issue in a not
really subtle way: it instead bounces the whole row. I tried to find a
better fix, but I don't like jqueryui and i don't want to spend too much
time on this.
Géry Debongnie [Mon, 27 Oct 2014 11:07:20 +0000 (12:07 +0100)]
[FIX] various layout fixes for web client
* fallback support for browser without calc,
* invisible pager in some cases
* correct colors for oe_stars
* readd oe_webclient class
Géry Debongnie [Mon, 27 Oct 2014 09:19:07 +0000 (10:19 +0100)]
[IMP] add warning when removing non global favorite
Géry Debongnie [Mon, 27 Oct 2014 09:05:07 +0000 (10:05 +0100)]
[FIX] fix display issue in safari
safari needs to use css rules prefixed with -webkit-
Géry Debongnie [Fri, 24 Oct 2014 13:43:31 +0000 (15:43 +0200)]
[FIX] css fixes: oe_mail size, and link color
Géry Debongnie [Fri, 24 Oct 2014 11:03:32 +0000 (13:03 +0200)]
[FIX] improvements to modal windows (web client)
problem is that they sometimes collapse to a single line, making it
difficult to operate the search view. Other problem is that content is
not displayed sometimes (when sub view manager). Other problem is that
it does not have a scrollbar. Sidenote: modals will be properly
reworked soon (tm).
Géry Debongnie [Fri, 24 Oct 2014 10:54:05 +0000 (12:54 +0200)]
[FIX] make sure that breadcrumbs are generic (web client)
breadcrumbs incorrectly assumed that they were made with views inside
viewmanagers. But client actions can be used in breadcrumbs, so the
action manager should play nice with these widgets.
Géry Debongnie [Fri, 24 Oct 2014 08:29:01 +0000 (10:29 +0200)]
[FIX] fix various display problems with ie11, ie10, ie9
Géry Debongnie [Fri, 24 Oct 2014 07:20:59 +0000 (09:20 +0200)]
[FIX] prevent a crash in ie9 (invalid setTimeout) (bus)
The call to this.poll return undefined, and IE9 does not like undefined
values in a timeout.
Géry Debongnie [Thu, 23 Oct 2014 10:09:14 +0000 (12:09 +0200)]
[FIX] css fixes (ie10) (web client)
Géry Debongnie [Thu, 23 Oct 2014 10:08:38 +0000 (12:08 +0200)]
[FIX] add tooltip to some buttons (graph view)
Géry Debongnie [Thu, 23 Oct 2014 09:25:26 +0000 (11:25 +0200)]
[FIX] fix button looks in module install view
The 'install' and 'installed' buttons are supposed to look different,
and to show the 'disabled' look on already installed modules.
Géry Debongnie [Thu, 23 Oct 2014 08:54:06 +0000 (10:54 +0200)]
[FIX] various css fixes (advanced search)
* dashboard did not display properly kanban in ie
* kanban did not extend to the bottom of the available screen
* custom filters did not display anything different when they were
public (not private)
* some small css problems
Géry Debongnie [Thu, 23 Oct 2014 07:41:36 +0000 (09:41 +0200)]
[FIX] correctly display check marks in measures (graph)
Géry Debongnie [Thu, 23 Oct 2014 07:15:37 +0000 (09:15 +0200)]
[FIX] hide 'add to dashboard' in mail menu
add to dashboard does not work with messaging client actions. So,
better to hide it than to have crashes.
Géry Debongnie [Thu, 23 Oct 2014 07:12:51 +0000 (09:12 +0200)]
[FIX] properly destroy client widgets (web client)
The new action manager only destroyed viewmanager widgets instead of
any old widget. It now checks for the widget class.
Also, minor improvement to clear_widgets: vms used to stand for
view_managers, but it can destroy any widget.
Géry Debongnie [Thu, 23 Oct 2014 06:51:26 +0000 (08:51 +0200)]
[FIX] fix display issue in IE in kanbans
vertical text in folded kanban groups did not have a correct
orientation in IE.
Also, stupid sass compiler insists on normalizing color codes. No idea
why
Géry Debongnie [Wed, 22 Oct 2014 13:52:04 +0000 (15:52 +0200)]
[IMP] change webclient structure: remove table
This is a small change if measured in lines of code, but is a large
change: it removes the table structure from the web client and use divs
instead. It will likely break a lot of things (some css selectors
will not work), but it should simplify our lives in the future:
closer to being responsive, easier layout computations for the browsers
(and hopefully less discrepencies between the results), simpler html, ...
Denis Ledoux [Tue, 28 Oct 2014 16:58:50 +0000 (17:58 +0100)]
[MERGE] forward port of branch 7.0 up to f4870f8
Denis Ledoux [Tue, 28 Oct 2014 16:57:08 +0000 (17:57 +0100)]
[FIX] sale: when invoicing on lines, set order in progress when all lines invoiced
This fix is related to rev.
b1df5aab6e529e9667bb97c96c9196e1a4e5e0ce
Frédéric Van der Essen [Tue, 28 Oct 2014 16:15:50 +0000 (17:15 +0100)]
Merge pull request #1678 from sebalix/8.0-fix-web_diagram
[FIX] 8.0 web_diagram, unlink connectors/transitions between nodes from the diagram view
Xavier Morel [Tue, 28 Oct 2014 15:38:03 +0000 (16:38 +0100)]
[FIX] add charset declaration to dashboard.sass so sassc stops freaking out
Denis Ledoux [Tue, 28 Oct 2014 15:19:26 +0000 (16:19 +0100)]
[FIX] account_analytic_plans: convert_ref method has been removed.
This issue is related to
f4e350ca36668d13c9eb09fbf77c85df110ce40c
Martin Trigaux [Tue, 28 Oct 2014 14:57:14 +0000 (15:57 +0100)]
[IMP] stock_account: stock journal in multicompany
Restrict the property_stock_journal to the main company only. This avoids errors in multicompany when the stock journal of the main company (getting an error company mismatch) is used instead of a more useful message explaining the missing stock journal.
Fixes #3251
Denis Ledoux [Tue, 28 Oct 2014 14:37:11 +0000 (15:37 +0100)]
[MERGE] forward port of branch 7.0 up to b1df5aa
Julien Legros [Tue, 28 Oct 2014 14:12:53 +0000 (15:12 +0100)]
[FIX] sale: trigger all_lines signal when all lines are invoiced
Florian Kisser [Thu, 7 Aug 2014 10:33:03 +0000 (12:33 +0200)]
[FIX] sql_db: don't log dsn with unmasked passwords
The dsn may contain the connection password of the database when not accessed from a psycopg connection object.
Replace the unfiltered logs to use cxn.dsn avoiding password leakage in logs.
Fixes #1433
Fabien Meghazi [Tue, 28 Oct 2014 13:42:18 +0000 (14:42 +0100)]
[ADD] Website KeyCDN integration guide
Jeremy Kersten [Tue, 28 Oct 2014 13:12:39 +0000 (14:12 +0100)]
[FIX] website_blog: use related to display the image from the author from a blog without that the partner is 'website_published'.
Denis Ledoux [Tue, 28 Oct 2014 12:43:25 +0000 (13:43 +0100)]
Revert "[FIX] mail: read more show original message"
This reverts commit
0790682296e43989e4e232189009c3ba380e32ba.
This fix is not yet ready. See PR #3295
Denis Ledoux [Tue, 28 Oct 2014 12:40:17 +0000 (13:40 +0100)]
[MERGE] forward port of branch 7.0 up to 00ec786
Denis Ledoux [Tue, 28 Oct 2014 12:18:22 +0000 (13:18 +0100)]
[FIX] account: partner balance general totals
General totals were not computed at all, due to the condition "if not self.ids" which was always true as self.ids wasn't set.
Besides, a parameter allows to display only partner with balance greater than 0, which was completely ignored by the totals computation methods: The totals always included all partners, even those having balance equals to 0
Antonio Esposito [Mon, 27 Oct 2014 12:00:18 +0000 (13:00 +0100)]
[FIX] hr_timesheet_invoice: warning in report generation
When generating the report 'Timesheet Profit', got a warning "The domain term '('user_id', '=', [...])' should use the 'in' or 'not in' operator."
This warning is due to the use of the '=' operator to compare the field 'user_id' while the reports sends a list of ids.
Fallback to still accept a single id in case of customised reports.
Christophe Simonis [Tue, 28 Oct 2014 09:59:19 +0000 (10:59 +0100)]
[FIX] event_sale: workaround for broken view.
Non-stored fields created with the new API are not converted to old
fields and added in `_columns` (and thus `_all_columns`). This forbid
them to be used in qweb views.
A fix will be commited in 8.0 to address this issue.
Martin Trigaux [Tue, 28 Oct 2014 09:15:36 +0000 (10:15 +0100)]
[FIX] l10n_fr: remove depedency to l10n_fr_rib
Cherry-pick of 4ff1c7c required due to fe1b2c0
Martin Trigaux [Tue, 28 Oct 2014 09:09:01 +0000 (10:09 +0100)]
[REM] l10n_fr_rib module
RIB format is no longer accepted by banks (replaced by SEPA) since 1st of August 2014, in regards of #3331
Alexis de Lattre [Mon, 27 Oct 2014 22:35:25 +0000 (23:35 +0100)]
[IMP] l10n_fr: remove dependency on l10n_fr_rib
The RIB (relevé d’identité bancaire) is no longer used in France since 1st of August 2014 (replaced by SEPA).
Raphael Collet [Thu, 23 Oct 2014 09:14:52 +0000 (11:14 +0200)]
[FIX] fields: inherited fields should get 'string' from their parent field
Because some parameters of a field may be determined during its setup, we have
to update the corresponding column after the setup, and recompute _all_columns
to make it consistent.
Martin Trigaux [Mon, 27 Oct 2014 17:02:59 +0000 (18:02 +0100)]
[FIX] sale_margin: cost price uom
When computing the cost price to display, take the uom into account. The cost of 1 Unit or 1 dozen should not be the same. opw 599727
Fabien Meghazi [Mon, 27 Oct 2014 16:55:08 +0000 (17:55 +0100)]
[FIX] Regression in image resize helper (Fixes #2529)
Commit
57ad514b makes the function preserve the aspect ration of the
original picture. Error of mine because the expected behavior was to
lose it for kanban view purpose.
For backward compatibility sake, this commit will keep the old behavior
by default.
Xavier Morel [Mon, 27 Oct 2014 15:41:42 +0000 (16:41 +0100)]
[ADD] doc: language switcher
Xavier Morel [Mon, 20 Oct 2014 05:47:14 +0000 (07:47 +0200)]
[ADD] Stripe-style APIDoc: content
Alexis de Lattre [Mon, 27 Oct 2014 11:28:48 +0000 (12:28 +0100)]
[FIX] Error in excel export when sheet name > 31 characters
XLWT only accepts sheet names smaller than 31 characters because that's the
excel limit.
Fixes #2548
Fixes #3318
Alexis de Lattre [Mon, 27 Oct 2014 11:14:19 +0000 (12:14 +0100)]
[FIX] account: fiscal position may map single tax to multiple taxes
(This is a regression in Odoo 8)
It should now work when a fiscal position replaces 1 tax with
several taxes (for example : Fiscal position "Intra-EU B2B" in l10n_fr)
Fixes #2261, manual merge of PR #3316
Ravi Gohil [Thu, 9 Oct 2014 11:21:29 +0000 (16:51 +0530)]
[FIX] stock: forbid adding new lines when processing picking
Source and destination locations are required and not displayed in the form view.
Adding new items when recieving a picking can not be easily guessed as we can put different locations for each line, using default locations may not be the expected result.
Instead should modify the original picking or create new one.
Fixes #2074, opw 612768
Raphael Collet [Mon, 27 Oct 2014 13:08:08 +0000 (14:08 +0100)]
[IMP] fields: reduce the number of attributes on _column instances
This is a memory optimization: instead of setting all attributes on all
instances, set them with their default value on the class, and only set
specific ones on instances. This reduces the memory footprint of around 14Mb
per registry with modules crm, sale, purchase and stock installed.
Antonio Esposito [Mon, 27 Oct 2014 11:13:18 +0000 (12:13 +0100)]
[FIX] Fix for Issue 2716: Hide 'Print' button for the report 'Timesheet Profit'
The report 'Profit Timesheet' shouldn't be directly displayed in the views related to the model 'account.analytic.line' but only from the reporting menu. In facts the report requires a popup to specify the report parameters.
Fixes #2716
Martin Trigaux [Mon, 27 Oct 2014 12:45:53 +0000 (13:45 +0100)]
[FIX] product_visible_discount: use on_change result for product value
At the end of the onchange call product_id_change, the uom may have changed (e.g. if product in different category).
To compute the quantity, we need to use the new uom and not the first one (that may be Unit, default value)
Josse Colpaert [Mon, 27 Oct 2014 12:29:00 +0000 (13:29 +0100)]
Merge pull request #3321 from odoo-dev/8.0-wmsmrpfixes-jco
[FIX] When extra move for consumption lines, copy lot and when producing...
Denis Ledoux [Mon, 27 Oct 2014 12:23:16 +0000 (13:23 +0100)]
[FIX] account: limit search for fields_view_get to one result
+ use ir.model.data get_object_reference method for better performance (cached result)
opw-616616
Denis Ledoux [Sat, 25 Oct 2014 12:26:52 +0000 (14:26 +0200)]
[FIX] mail: read more show original message
Instead of html cleaned html, to allow display blockquotes
opw-614729
Frederic van der Essen [Mon, 27 Oct 2014 11:28:47 +0000 (12:28 +0100)]
[FIX] web: cors rpc calls were missing the session cookie, resulting in new sessions being created for every call
Frederic van der Essen [Mon, 27 Oct 2014 11:21:04 +0000 (12:21 +0100)]
[FIX] web: cors rpc calls were missing the session cookie, resulting in new sessions being created for every call
Martin Trigaux [Mon, 27 Oct 2014 11:03:01 +0000 (12:03 +0100)]
Forward port of branch 7.0 up to rev 8abd003
Martin Trigaux [Mon, 27 Oct 2014 10:41:23 +0000 (11:41 +0100)]
[FIX] product: reference in test
Martin Trigaux [Mon, 27 Oct 2014 10:21:41 +0000 (11:21 +0100)]
Forward port of branch 7.0 up to 42bf0a5
Stéphane Bidoul [Sat, 25 Oct 2014 13:19:20 +0000 (15:19 +0200)]
[FIX] avoid leaving dangling account moves when deleting a bank statement
Fixes #3292
Christophe Matthieu [Mon, 29 Sep 2014 08:32:00 +0000 (10:32 +0200)]
[FIX] website.sale: Double / triple digits do not get displayed correctly on ecommerce quantity selector
Christophe Matthieu [Mon, 29 Sep 2014 10:26:13 +0000 (12:26 +0200)]
[FIX] account.fiscal.position: Fix get_fiscal_position for auto apply:
First match a fiscal position for the given country, then for a country
group containing the country. If none found, search a fiscal position
without country nor country group
Christophe Matthieu [Mon, 29 Sep 2014 14:12:57 +0000 (16:12 +0200)]
[FIX] website_sale_options: only one optional product is added to the cart and the quantity of the optional product don't change in the cart when we click on more or less. Fix the number of items displayed in the modal options.
Christophe Matthieu [Tue, 30 Sep 2014 09:44:51 +0000 (11:44 +0200)]
[FIX] website: update jQuery.transfo lib + adapt code
Christophe Matthieu [Mon, 29 Sep 2014 15:12:49 +0000 (17:12 +0200)]
[FIX] product: is_product_variant is all time false. result: can not change ean because the field is hidden in the view. Need to overwrite the function field on product.product to have the real value (true for product.product)
Christophe Matthieu [Mon, 29 Sep 2014 14:04:03 +0000 (16:04 +0200)]
[FIX] website_sale: Postal Code is required during checkout for countries without postal codes; Zip must be not required.
Josse Colpaert [Sat, 25 Oct 2014 19:30:18 +0000 (21:30 +0200)]
[FIX] When extra move for consumption lines, copy lot and when producing more than produced, create extra move
Josse Colpaert [Fri, 24 Oct 2014 17:58:48 +0000 (19:58 +0200)]
Merge pull request #3294 from odoo-dev/8.0-fixextrapack-jco
[FIX] Operation does not necessary have product for extra move
Christophe Simonis [Fri, 24 Oct 2014 16:23:46 +0000 (18:23 +0200)]
[MERGE] forward port of branch 8.0 up to 92183e5