CRAFTERCMS-133: Managing this issue for next week release.