*** Some RTL configuration adjustments
*** Avoid NPE in REST API