Merge remote-tracking branch 'regulator/topic/dropout' into HEAD