Merge pull request #1627 from shackbarth/24005-fre