Fixing incorrect lifecycle calls
Retrofiting settings section
Add JRS 6.0 to the test profiles list
Upmerge with develop