BAP-6082: Comment entity is added