fix with unit test for GPPLATFORMCORE-53