7.0 merge

Merged Uriel Mayo requested to merge 7.0-merge into 7.0-stage

Resolving merge from JSTmp

Merge request reports