Merge tag 'v1.2.3' into develop

Finished fixing everything! HOPEFULLY
Added caching for ajax template request