Ticket #4492 project guidelines conformance