Ticket #22599 - Support for CS6 and CC