BC-1296 #comment migrating..