SYS-fix-39a7.8: Small fixes and updates
SYS-fix-39a7.9: Small fixes and updates