Reorganize some logic related to @BindUsing and the special processing Strings (trim, convert to null)
add @Override where applicable
Merge branch '2.3.x'