[#64343772] Further amendments to common.js