Synchronize with main project version 7.3