Systems Updates

Bug fixes for Systems
merge remote tracking branch origin/master