Merge: safin/f847-exclude-pinboard