Merge branches 'rotating' and 'redomasks' into develop