updated version to 2.4:
Merged with SF-version