[terminatorX/f24] (3 commits) ...Fixed BRs and synced with upstream spec file where possible.