* Fix for the bug LP: #272509
* Making APTonCD cosume less memory.
