BACKLOG-3862 : handle nodes for extension nodes