Merge pull request #5776 from jflyper/bfdev-handle-overloaded-cs-pin