Sources synched with the latest one from Release 6