[RCD] Configuration changes in git master