Merge "Fix for issue 1114 compile error"