MT#7705 - Rework logging for Controller/Contract module