Initial version of SUPPORT-1137
Adjusted SUPPORT-1137 to show mis-behavior