ARQUIDEAS-1013 # Changes in comments