Merging master fixing

Sync with the boss repo