Full update of #ZC-540