coeus-5.2.x branch merge