merge in latest 4.0
Merge commit 'd7a8dbc' into develop: meta only