Fixing issue: #11487 Minor fixes First Release