Merge branches 'feat_accel_decouple' and 'feat_accel_decouple' of git.soton.ac.uk:soclabs/nanosoc into feat_accel_decouple