Merge branch 'develop' into global-status-expiration