Fix JIRA #LRA-105 and minor enhancements/updates