Merge "Remove potential duplicate runnable + add logging"