fix content-available
Merge branch 'dev'