Updated functional blocs
Merge remote-tracking branch 'Upstream/master'