Merge branches 'rotating' and 'redomasks-old' into develop