Fixing html error validation
Merge branch 'develop' of local repository into APD-740-IMR
Merge branch 'APD-740-IMR' into develop