FEC-2453  #comment added defines for short code