Merge to v5.3.1 (cherry picked from commit de9ccea7f1)
de9ccea7f1
scribble/jfp' and
css-addition' and