Comment change
Got rid of active indicator
Merge branch 'master' into url-support