Bug fix
Merge branch 'feature-ajax-fresh' into custom-aplus2