Merge "MSVS compiler error" into experimental