Kinda merge #14 (in intent)