MKL-343 Dev Test Issues - Template-Resolved