#JC-1654 change messages