Preparation for R61

This version provides some required changes to be compatible with an upcoming club version.

This (or another future update) will become the minimum required version on the next club update.