Merge "Reduced size of control depth index ranges" into devel/master