Kept edraak_common.py just like it is in master