Merge branches 'redomasks' and 'rotating' into develop