BF|PM: fix carousel bug. merge
Resolves #21