Merge back changes from djberg96