Merged with UIBlocker
Merge remote-tracking branch 'origin/Development'