fix merge error
nitfixes
Merge branch 'v5-stable' into v7-stable