Use case 4.1 and 5.4 update and minor big fixes