Merge branches 'redomasks', 'rotating' and 'blocktype-adjustments' into develop