Merge latest bug fixes on 4.7.3 and latests changes to 4.8 #995

Closed tonydisera closed 10 months ago