Merge branch '20674-cope-with-python3-flask-update' into 'devel'