Merge from develop - Rebuild checks