Manual changes for new problems plugin
Merge commit '0cba3ed74df07c76e101a549c70c584a3ea00c00' into develop