Merge remote-tracking branch 'remotes/origin/develop' into develop
Clarify messages in custom preprocessor's test case