+ Javadoc added
+ Test update
Refs: #18169
+ conflicts resolved and merged
Refs: #18169
+ warnings are eliminated
Refs: #18169