refs #6667 Synchronized Merlin changes with users repository

(hopefully correctly synchronized)