#2248 add executor + fixes