Point 2 will be handled in Change Request itself. Point 1 is actually related to two problems in diagram extension: https://github.com/xwikisas/application-diagram/issues/253 and https://github.com/xwikisas/application-diagram/issues/252