Navicats

Closes #5654.