Merge branch 'develop' into fix/firefox-select-infinity-loop