MCF-4042 Fixed the comment saving and commented some code