'correcting whitelist'
Merge branch 'development'