Merge "Initial versions of Bus Controller jjb"