Merge back from sdcc-240