FUTURE comment for update process
Merge remote-tracking branch 'origin/4.0' into 4.0