Diamond Support&APC

   @Mervelatte