Support included blocks override
Merge remote-tracking branch 'paradoxxxzero/include_fix'