#gt-16 Fixed. Drop subscription feature fixed too.
Merge remote-tracking branch 'origin/master'