Merge branch 'develop' into issue-22
check Not-Modified status for XHR
Merge branch 'issue-22' into develop