Ajax Comment Form on Panelized Page (entity_field:node:comment)

Hi there, thank you for this incredibly useful module!

While I have ajax comments working on all my regular node pages. The main comment add form doesn't work and it seems to do with the wrapper_html_id being different and referencing an ID that doesn't exist. I have traced this to the form itself and isolated to:

$wrapper_html_id = $render_array[$field_name]['#attributes']['id'];

Non Panelized Page:
- wrapper_html_id: #node-app-comment
- actual id: #node-app-comment

Panelized Page:

- wrapper_html_id: #node-app-comment--56
- actual id: #node-app-comment--2

Additionally as an added data point the individual comment links all still work (edit, delete, reply) regardless of being a panelized page with ctools comment block or not.