ONLINE-3723-fix-for-builds