Completes issue SKLTP-563