Merge "Modifying Shell to accomodate remote bugreports"